From ef6c97e227668d655c844317d54339c1c0700518 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 14 Sep 2018 09:17:13 +0100 Subject: [PATCH] Drop obsolete patches --- debian/changelog | 10 +-- ...-we-have-access-to-GL-before-using-G.patch | 54 ------------ debian/patches/git_add-a-return-value.patch | 36 -------- .../git_add-default-return-values.patch | 78 ------------------ debian/patches/git_fix-build.patch | 50 ----------- .../patches/git_install-printbackends.patch | 82 ------------------- debian/patches/no-accessibility-dump.patch | 27 ------ debian/patches/reftest-known-fail.patch | 6 +- debian/patches/series | 6 -- 9 files changed, 7 insertions(+), 342 deletions(-) delete mode 100644 debian/patches/gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch delete mode 100644 debian/patches/git_add-a-return-value.patch delete mode 100644 debian/patches/git_add-default-return-values.patch delete mode 100644 debian/patches/git_fix-build.patch delete mode 100644 debian/patches/git_install-printbackends.patch delete mode 100644 debian/patches/no-accessibility-dump.patch diff --git a/debian/changelog b/debian/changelog index 566ae26712..a45314178b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,13 +6,7 @@ gtk+4.0 (3.92.1-2) UNRELEASED; urgency=medium * README has been renamed to README.md * debian/libgtk-4-0.symbols: Update * debian/libgtk-4-common.install.in: themes are bundled in the gtkresources - * Refresh no-accessibility-dump.patch * Disable 018_gdkenumtypes.c_location.patch: might not be needed any more - * Cherry-pick patches: - - git_add-a-return-value.patch - - git_add-default-return-values.patch - - git_fix-build.patch - - git_install-printbackends.patch * Update Vcs fields for migration to https://salsa.debian.org/ [ Simon McVittie ] @@ -26,6 +20,10 @@ gtk+4.0 (3.92.1-2) UNRELEASED; urgency=medium * d/copyright: Update * Normalize various packaging files with wrap-and-sort -a * Update build-dependencies + * d/p/gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch: + Drop, obsoleted by commit 02eb344 in GTK+ 3.93 + * d/p/no-accessibility-dump.patch: Drop, no longer needed. + The build-time tests correctly set GTK_CSD=1 now. -- Jeremy Bicha Fri, 19 Jan 2018 22:05:35 -0500 diff --git a/debian/patches/gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch b/debian/patches/gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch deleted file mode 100644 index a5349d9459..0000000000 --- a/debian/patches/gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Emmanuele Bassi -Date: Fri, 20 Jan 2017 18:07:01 +0000 -Subject: [PATCH] gdk/x11: Check if we have access to GL before using GLX API - -If the platform does not have access to libGL then any call to GL and -GLX API through libepoxy will fail with an assertion. Until such time -that libepoxy exposes API for us to use, we can simply dlopen libGL -ourselves and do a symbol check. - -[smcv: fix typo] - -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=775279 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=847366 ---- - gdk/x11/gdkglcontext-x11.c | 26 ++++++++++++++++++++++++++ - 1 file changed, 26 insertions(+) - -diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c -index d76c29e..086a99e 100644 ---- a/gdk/x11/gdkglcontext-x11.c -+++ b/gdk/x11/gdkglcontext-x11.c -@@ -797,6 +797,32 @@ gdk_x11_screen_init_gl (GdkScreen *screen) - if (_gdk_gl_flags & GDK_GL_DISABLE) - return FALSE; - -+ /* This is an ad hoc check that bypasses libepoxy to check if libGL.so is -+ * unavailable, and disables GL support if that's the case -+ * -+ * Ideally, libepoxy should do this for us, but that would require adding -+ * new API, and we'd need a fallback anyway. -+ */ -+ { -+ Bool (* fp_glXQueryExtension) (Display *dpy, int *err_base, int *ev_base); -+ GModule *module = g_module_open ("libGL.so.1", 0); -+ -+ if (module == NULL) -+ { -+ GDK_NOTE (OPENGL, g_message ("No libGL.so found")); -+ return FALSE; -+ } -+ -+ if (!g_module_symbol (module, "glXQueryExtension", (gpointer *) &fp_glXQueryExtension)) -+ { -+ GDK_NOTE (OPENGL, g_message ("No glXQueryExtension symbol found")); -+ g_module_close (module); -+ return FALSE; -+ } -+ -+ g_module_close (module); -+ } -+ - dpy = gdk_x11_display_get_xdisplay (display); - - if (!glXQueryExtension (dpy, &error_base, &event_base)) diff --git a/debian/patches/git_add-a-return-value.patch b/debian/patches/git_add-a-return-value.patch deleted file mode 100644 index 5f1fb8055e..0000000000 --- a/debian/patches/git_add-a-return-value.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Emmanuele Bassi -Date: Tue, 24 Oct 2017 16:58:06 +0100 -Subject: Add a return value - -When building with G_DISABLE_ASSERT, the g_assert_not_reached() -statement won't do anything, and we're going to fall through, and the -compiler will emit a warning that we're not returning anything from a -function with a return value. ---- - gdk/wayland/gdkwindow-wayland.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c -index cbc7bfb..61e1dcd 100644 ---- a/gdk/wayland/gdkwindow-wayland.c -+++ b/gdk/wayland/gdkwindow-wayland.c -@@ -1617,6 +1617,9 @@ rect_anchor_to_anchor (GdkGravity rect_anchor) - default: - g_assert_not_reached (); - } -+ -+ return (ZXDG_POSITIONER_V6_ANCHOR_TOP | -+ ZXDG_POSITIONER_V6_ANCHOR_LEFT); - } - - static enum zxdg_positioner_v6_gravity -@@ -1650,6 +1653,9 @@ window_anchor_to_gravity (GdkGravity rect_anchor) - default: - g_assert_not_reached (); - } -+ -+ return (ZXDG_POSITIONER_V6_GRAVITY_BOTTOM | -+ ZXDG_POSITIONER_V6_GRAVITY_RIGHT); - } - - static GdkWindow * diff --git a/debian/patches/git_add-default-return-values.patch b/debian/patches/git_add-default-return-values.patch deleted file mode 100644 index 77646a587b..0000000000 --- a/debian/patches/git_add-default-return-values.patch +++ /dev/null @@ -1,78 +0,0 @@ -From: Benjamin Otte -Date: Tue, 24 Oct 2017 18:13:45 +0200 -Subject: Add default return values to switch statements - -We are using g_assert_not_reached() without doing anything, assuming it -aborts the program. In release builds however, it is ignored. ---- - gdk/x11/gdkdevicemanager-core-x11.c | 2 ++ - gdk/x11/gdkdevicemanager-xi2.c | 2 ++ - gtk/gtkcssselector.c | 1 + - gtk/inspector/general.c | 2 +- - 4 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c -index 350a79b..dd8613e 100644 ---- a/gdk/x11/gdkdevicemanager-core-x11.c -+++ b/gdk/x11/gdkdevicemanager-core-x11.c -@@ -265,6 +265,7 @@ translate_crossing_mode (int mode) - return GDK_CROSSING_UNGRAB; - default: - g_assert_not_reached (); -+ return GDK_CROSSING_NORMAL; - } - } - -@@ -285,6 +286,7 @@ translate_notify_type (int detail) - return GDK_NOTIFY_NONLINEAR_VIRTUAL; - default: - g_assert_not_reached (); -+ return GDK_NOTIFY_UNKONWN; - } - } - -diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c -index 8779c65..758513e 100644 ---- a/gdk/x11/gdkdevicemanager-xi2.c -+++ b/gdk/x11/gdkdevicemanager-xi2.c -@@ -1068,6 +1068,7 @@ translate_crossing_mode (gint mode) - /* Fall through, unexpected in pointer crossing events */ - default: - g_assert_not_reached (); -+ return GDK_CROSSING_NORMAL; - } - } - -@@ -1088,6 +1089,7 @@ translate_notify_type (gint detail) - return GDK_NOTIFY_NONLINEAR_VIRTUAL; - default: - g_assert_not_reached (); -+ return GDK_NOTIFY_UNKONWN; - } - } - -diff --git a/gtk/gtkcssselector.c b/gtk/gtkcssselector.c -index 241a690..961e78e 100644 ---- a/gtk/gtkcssselector.c -+++ b/gtk/gtkcssselector.c -@@ -876,6 +876,7 @@ change_pseudoclass_position (const GtkCssSelector *selector) - return GTK_CSS_CHANGE_FIRST_CHILD | GTK_CSS_CHANGE_LAST_CHILD; - default: - g_assert_not_reached (); -+ return 0; - } - } - -diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c -index 2e7e212..62404a0 100644 ---- a/gtk/inspector/general.c -+++ b/gtk/inspector/general.c -@@ -501,7 +501,7 @@ translate_subpixel_layout (GdkSubpixelLayout subpixel) - case GDK_SUBPIXEL_LAYOUT_HORIZONTAL_BGR: return "horizontal bgr"; - case GDK_SUBPIXEL_LAYOUT_VERTICAL_RGB: return "vertical rgb"; - case GDK_SUBPIXEL_LAYOUT_VERTICAL_BGR: return "vertical bgr"; -- default: g_assert_not_reached (); -+ default: g_assert_not_reached (); return "none; - } - } - diff --git a/debian/patches/git_fix-build.patch b/debian/patches/git_fix-build.patch deleted file mode 100644 index ffeea20f02..0000000000 --- a/debian/patches/git_fix-build.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Benjamin Otte -Date: Tue, 24 Oct 2017 18:26:08 +0200 -Subject: Fix build - -Don't do two things at once and forget to run ninja before pushing. ---- - gdk/x11/gdkdevicemanager-core-x11.c | 2 +- - gdk/x11/gdkdevicemanager-xi2.c | 2 +- - gtk/inspector/general.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c -index dd8613e..c662d21 100644 ---- a/gdk/x11/gdkdevicemanager-core-x11.c -+++ b/gdk/x11/gdkdevicemanager-core-x11.c -@@ -286,7 +286,7 @@ translate_notify_type (int detail) - return GDK_NOTIFY_NONLINEAR_VIRTUAL; - default: - g_assert_not_reached (); -- return GDK_NOTIFY_UNKONWN; -+ return GDK_NOTIFY_UNKNOWN; - } - } - -diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c -index 758513e..56fb2c8 100644 ---- a/gdk/x11/gdkdevicemanager-xi2.c -+++ b/gdk/x11/gdkdevicemanager-xi2.c -@@ -1089,7 +1089,7 @@ translate_notify_type (gint detail) - return GDK_NOTIFY_NONLINEAR_VIRTUAL; - default: - g_assert_not_reached (); -- return GDK_NOTIFY_UNKONWN; -+ return GDK_NOTIFY_UNKNOWN; - } - } - -diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c -index 62404a0..45a386e 100644 ---- a/gtk/inspector/general.c -+++ b/gtk/inspector/general.c -@@ -501,7 +501,7 @@ translate_subpixel_layout (GdkSubpixelLayout subpixel) - case GDK_SUBPIXEL_LAYOUT_HORIZONTAL_BGR: return "horizontal bgr"; - case GDK_SUBPIXEL_LAYOUT_VERTICAL_RGB: return "vertical rgb"; - case GDK_SUBPIXEL_LAYOUT_VERTICAL_BGR: return "vertical bgr"; -- default: g_assert_not_reached (); return "none; -+ default: g_assert_not_reached (); return "none"; - } - } - diff --git a/debian/patches/git_install-printbackends.patch b/debian/patches/git_install-printbackends.patch deleted file mode 100644 index 9bf2e3e919..0000000000 --- a/debian/patches/git_install-printbackends.patch +++ /dev/null @@ -1,82 +0,0 @@ -From: Marek Kasik -Date: Thu, 19 Oct 2017 13:59:58 +0200 -Subject: printing: Install printbackends - -Add "install : true" for each printbackend so that they are installed. - -https://bugzilla.gnome.org/show_bug.cgi?id=789185 ---- - modules/printbackends/cloudprint/meson.build | 3 ++- - modules/printbackends/cups/meson.build | 3 ++- - modules/printbackends/file/meson.build | 3 ++- - modules/printbackends/lpr/meson.build | 3 ++- - modules/printbackends/papi/meson.build | 3 ++- - modules/printbackends/test/meson.build | 3 ++- - 6 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/modules/printbackends/cloudprint/meson.build b/modules/printbackends/cloudprint/meson.build -index c6193f4..f5217cb 100644 ---- a/modules/printbackends/cloudprint/meson.build -+++ b/modules/printbackends/cloudprint/meson.build -@@ -7,4 +7,5 @@ shared_module('printbackend-cloudprint', - '-DGTK_DISABLE_DEPRECATION_WARNINGS', - ], - dependencies: [ libgtk_dep, rest_dep, json_glib_dep ], -- install_dir: printbackends_install_dir) -+ install_dir: printbackends_install_dir, -+ install : true) -diff --git a/modules/printbackends/cups/meson.build b/modules/printbackends/cups/meson.build -index e69788d..a6f83d5 100644 ---- a/modules/printbackends/cups/meson.build -+++ b/modules/printbackends/cups/meson.build -@@ -18,4 +18,5 @@ shared_module('printbackend-cups', - '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED', - ], - dependencies: [libgtk_dep, libcups, colord_dep], -- install_dir: printbackends_install_dir) -+ install_dir: printbackends_install_dir, -+ install : true) -diff --git a/modules/printbackends/file/meson.build b/modules/printbackends/file/meson.build -index 52ab3a3..b1604be 100644 ---- a/modules/printbackends/file/meson.build -+++ b/modules/printbackends/file/meson.build -@@ -6,4 +6,5 @@ shared_module('printbackend-file', - '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED', - ], - dependencies: libgtk_dep, -- install_dir: printbackends_install_dir) -+ install_dir: printbackends_install_dir, -+ install : true) -diff --git a/modules/printbackends/lpr/meson.build b/modules/printbackends/lpr/meson.build -index 95a982d..581ca77 100644 ---- a/modules/printbackends/lpr/meson.build -+++ b/modules/printbackends/lpr/meson.build -@@ -6,4 +6,5 @@ shared_module('printbackend-lpr', - '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED', - ], - dependencies: libgtk_dep, -- install_dir: printbackends_install_dir) -+ install_dir: printbackends_install_dir, -+ install : true) -diff --git a/modules/printbackends/papi/meson.build b/modules/printbackends/papi/meson.build -index feef640..647234e 100644 ---- a/modules/printbackends/papi/meson.build -+++ b/modules/printbackends/papi/meson.build -@@ -6,4 +6,5 @@ shared_module('printbackend-papi', - '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED', - ], - dependencies: [libgtk_dep, libpapi], -- install_dir: printbackends_install_dir) -+ install_dir: printbackends_install_dir, -+ install : true) -diff --git a/modules/printbackends/test/meson.build b/modules/printbackends/test/meson.build -index a8df4fe..29cf00b 100644 ---- a/modules/printbackends/test/meson.build -+++ b/modules/printbackends/test/meson.build -@@ -6,4 +6,5 @@ shared_module('printbackend-test', - '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED', - ], - dependencies: libgtk_dep, -- install_dir: printbackends_install_dir) -+ install_dir: printbackends_install_dir, -+ install : true) diff --git a/debian/patches/no-accessibility-dump.patch b/debian/patches/no-accessibility-dump.patch deleted file mode 100644 index 428b61baac..0000000000 --- a/debian/patches/no-accessibility-dump.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Andreas Henriksson -Date: Wed, 23 Mar 2016 14:10:27 +0100 -Subject: disable a11y test accessibility-dump - -Temporarily disable this test until someone figures out how -to make it run with GTK_CSD=1 properly so it gives output -matching the expected test data in all cases, not just -for installed-tests. - -Forwarded: no ---- - testsuite/a11y/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build -index 164eda4..5db57c5 100644 ---- a/testsuite/a11y/meson.build -+++ b/testsuite/a11y/meson.build -@@ -2,7 +2,7 @@ testexecdir = join_paths(installed_test_bindir, 'a11y') - testdatadir = join_paths(installed_test_datadir, 'a11y') - - a11y_tests = [ -- 'accessibility-dump', -+# 'accessibility-dump', - 'tree-performance', - 'text', - 'children', diff --git a/debian/patches/reftest-known-fail.patch b/debian/patches/reftest-known-fail.patch index d719e59d52..33295738f5 100644 --- a/debian/patches/reftest-known-fail.patch +++ b/debian/patches/reftest-known-fail.patch @@ -8,10 +8,10 @@ Forwarded: no 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c -index 758007a..37d1bfc 100644 +index 3a4792e..b6f3738 100644 --- a/testsuite/reftests/gtk-reftest.c +++ b/testsuite/reftests/gtk-reftest.c -@@ -256,6 +256,20 @@ save_image (cairo_surface_t *surface, +@@ -250,6 +250,20 @@ save_image (cairo_surface_t *surface, g_free (filename); } @@ -32,7 +32,7 @@ index 758007a..37d1bfc 100644 static void test_ui_file (GFile *file) { -@@ -288,7 +302,13 @@ test_ui_file (GFile *file) +@@ -282,7 +296,13 @@ test_ui_file (GFile *file) if (diff_image) { save_image (diff_image, ui_file, ".diff.png"); diff --git a/debian/patches/series b/debian/patches/series index cfaa580a3e..4eb58e1dc6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1 @@ -no-accessibility-dump.patch reftest-known-fail.patch -gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch -git_add-a-return-value.patch -git_add-default-return-values.patch -git_fix-build.patch -git_install-printbackends.patch -- 2.30.2